From: Kim F. Storm <storm@cua.dk>
Date: Mon, 10 May 2004 11:15:55 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22592
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9cc59a4640fee979660b167c02c4ce8a47ff4841;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b560c3d02a8..5f80140066b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-10  Kim F. Storm  <storm@cua.dk>
+
+	* xdisp.c (calc_line_height_property): Use string position when
+	object is a string.
+
 2004-05-10  Kenichi Handa  <handa@m17n.org>
 
 	* fns.c (count_combining): Delete it.